From f9a12132bea95b5d6591a72ba97c57909dfbebf4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20R=C3=B6hling?= Date: Wed, 26 Jan 2022 13:34:38 +0100 Subject: [PATCH] Rename resgen executable to avoid conflict with mono-devel Closes: #1004380 --- debian/libfilament-tools.manpages | 2 +- .../manpages/{resgen.1 => filament-resgen.1} | 8 ++-- ...ecutable-to-avoid-conflict-with-mono.patch | 43 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 49 insertions(+), 5 deletions(-) rename debian/manpages/{resgen.1 => filament-resgen.1} (92%) create mode 100644 debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch diff --git a/debian/libfilament-tools.manpages b/debian/libfilament-tools.manpages index 281d4ba..019dd8c 100644 --- a/debian/libfilament-tools.manpages +++ b/debian/libfilament-tools.manpages @@ -5,6 +5,6 @@ debian/manpages/matc.1 debian/manpages/matinfo.1 debian/manpages/mipgen.1 debian/manpages/normal-blending.1 -debian/manpages/resgen.1 +debian/manpages/filament-resgen.1 debian/manpages/roughness-prefilter.1 debian/manpages/specular-color.1 diff --git a/debian/manpages/resgen.1 b/debian/manpages/filament-resgen.1 similarity index 92% rename from debian/manpages/resgen.1 rename to debian/manpages/filament-resgen.1 index a71366a..a0c1b64 100644 --- a/debian/manpages/resgen.1 +++ b/debian/manpages/filament-resgen.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH RESGEN "1" "October 2021" "resgen " "User Commands" +.TH FILAMENT-RESGEN "1" "October 2021" "resgen " "User Commands" .SH NAME -resgen \- filament material tools +filament-resgen \- filament material tools .SH DESCRIPTION -resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id +filament-resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id is the basename of the input file. It produces the following set of files: .IP resources.h ......... declares sizes and offsets for each resource @@ -12,7 +12,7 @@ resources.apple.S ... ditto but with different rodata name and underscore prefix resources.bin ....... the aggregated binary blob that the incbin refers to .SS "Usage:" .IP -resgen [options] ... +filament-resgen [options] ... .SH OPTIONS .HP \fB\-\-help\fR, \fB\-h\fR diff --git a/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch b/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch new file mode 100644 index 0000000..07820dc --- /dev/null +++ b/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch @@ -0,0 +1,43 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Wed, 26 Jan 2022 13:31:12 +0100 +Subject: Rename resgen executable to avoid conflict with mono-devel + +--- + tools/resgen/CMakeLists.txt | 1 + + tools/resgen/src/main.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/resgen/CMakeLists.txt b/tools/resgen/CMakeLists.txt +index 701931c..25721fd 100644 +--- a/tools/resgen/CMakeLists.txt ++++ b/tools/resgen/CMakeLists.txt +@@ -13,6 +13,7 @@ set(SRCS src/main.cpp) + # ================================================================================================== + add_executable(${TARGET} ${SRCS}) + target_link_libraries(${TARGET} PRIVATE utils getopt) ++set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME filament-${TARGET}) + + # ================================================================================================= + # Licenses +diff --git a/tools/resgen/src/main.cpp b/tools/resgen/src/main.cpp +index 8cae171..e126b34 100644 +--- a/tools/resgen/src/main.cpp ++++ b/tools/resgen/src/main.cpp +@@ -41,7 +41,7 @@ static bool g_quietMode = false; + static bool g_embedJson = false; + + static const char* USAGE = R"TXT( +-RESGEN aggregates a sequence of binary blobs, each of which becomes a "resource" whose id ++filament-resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id + is the basename of the input file. It produces the following set of files: + + resources.h ......... declares sizes and offsets for each resource +@@ -50,7 +50,7 @@ is the basename of the input file. It produces the following set of files: + resources.bin ....... the aggregated binary blob that the incbin refers to + + Usage: +- RESGEN [options] ... ++ filament-resgen [options] ... + + Options: + --help, -h diff --git a/debian/patches/series b/debian/patches/series index 7cbd69b..6961317 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0007-Link-against-libatomic.patch 0008-Migrate-to-astc-encoder-API-from-Debian-package.patch 0009-Fix-library-export-for-Debian.patch +0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch -- 2.30.2